Fix typo so ctrl gets passed on to the gdk event.

2006-02-20  Anders Carlsson  <andersca@mac.com>

        * gdk/quartz/gdkevents-quartz.c:
        (get_keyboard_modifiers_from_nsevent):
        Fix typo so ctrl gets passed on to the gdk event.

        * gdk/quartz/gdkproperty-quartz.c:
        (gdk_atom_name):
        g_strdup the atom name.

diff --git a/ChangeLog b/ChangeLog
index 908d53e2a3b436bcdb72598624203f2e55bce41e..c007727cbcab2167ded7ae0d3a1d13b495a890d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-20  Anders Carlsson  <andersca@mac.com>
+
+        * gdk/quartz/gdkevents-quartz.c:
+        (get_keyboard_modifiers_from_nsevent):
+       Fix typo so ctrl gets passed on to the gdk event.
+       
+        * gdk/quartz/gdkproperty-quartz.c:
+        (gdk_atom_name):
+       g_strdup the atom name.
+
 2006-02-20  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 908d53e2a3b436bcdb72598624203f2e55bce41e..c007727cbcab2167ded7ae0d3a1d13b495a890d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2006-02-20  Anders Carlsson  <andersca@mac.com>
+
+        * gdk/quartz/gdkevents-quartz.c:
+        (get_keyboard_modifiers_from_nsevent):
+       Fix typo so ctrl gets passed on to the gdk event.
+       
+        * gdk/quartz/gdkproperty-quartz.c:
+        (gdk_atom_name):
+       g_strdup the atom name.
+
 2006-02-20  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes):

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 7b8c8132e36723bbca0cee8dacbb989ce50962dc..e5470bbc7f1a481e2f1d3f88f41b5eff7cb6d128 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -612,7 +612,7 @@ get_keyboard_modifiers_from_nsevent (NSEvent *nsevent)
     modifiers |= GDK_SHIFT_MASK;
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
-  if (nsflags & NSControlKeyMask)
+  if (nsflags & NSCommandKeyMask)
     modifiers |= GDK_MOD1_MASK;
   
   /* FIXME: Support GDK_BUTTON_MASK */

diff --git a/gdk/quartz/gdkproperty-quartz.c b/gdk/quartz/gdkproperty-quartz.c
index 0456d25e25567ea6af4cf419fda0e867c209e0ac..c006c195f12ea9cb5bfa23aa72de30a898b13ec1 100644 (file)
--- a/gdk/quartz/gdkproperty-quartz.c
+++ b/gdk/quartz/gdkproperty-quartz.c
@@ -170,7 +170,7 @@ gdk_atom_name (GdkAtom atom)
   if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
     return NULL;
     
-  return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom));
+  return g_strdup (g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)));
 }
 
 void